test(mergeWith): include mergeWith tests from 7.x #7315

jakovljevic-mladen · 2023-08-07T07:04:42Z

Description:
Since PR #7281 that was recently merged to 7.x branch had some tests that are helpful for current master branch, I wanted to cherry pick that commit and create a PR for it, but I failed due to fix being done in non-existing file on master branch tree. So I picked it on my own because mergeWith operator on master does not have this issue at all.

I also removed two tests from mergeWith spec file that are related to mergeAll operator. They are redundant and already exist in mergeAll spec file:

rxjs/spec/operators/mergeAll-spec.ts

Lines 529 to 557 in 2947583

    
           it('should merge two observables', (done) => { 
        
             const a = of(1, 2, 3); 
        
             const b = of(4, 5, 6, 7, 8); 
        
             const r = [1, 2, 3, 4, 5, 6, 7, 8]; 
        
             of(a, b) 
        
               .pipe(mergeAll()) 
        
               .subscribe({ 
        
                 next: (val) => { 
        
                   expect(val).to.equal(r.shift()); 
        
                 }, 
        
                 complete: done, 
        
               }); 
        
           }); 
        
           it('should merge two immediately-scheduled observables', (done) => { 
        
             const a = scheduled([1, 2, 3], queueScheduler); 
        
             const b = scheduled([4, 5, 6, 7, 8], queueScheduler); 
        
             const r = [1, 2, 4, 3, 5, 6, 7, 8]; 
        
             scheduled([a, b], queueScheduler) 
        
               .pipe(mergeAll()) 
        
               .subscribe({ 
        
                 next: (val) => { 
        
                   expect(val).to.equal(r.shift()); 
        
                 }, 
        
                 complete: done, 
        
               }); 
        
           });

Related issue (if exists):
PR #7281

test(mergeWith): include mergeWith tests from 7.x

14efe00

benlesh approved these changes Dec 19, 2023

View reviewed changes

Merge branch 'master' into mergeWith-cherry-pick-tests

2e0ad9d

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test(mergeWith): include mergeWith tests from 7.x #7315

test(mergeWith): include mergeWith tests from 7.x #7315

jakovljevic-mladen commented Aug 7, 2023

	it('should merge two observables', (done) => {
	const a = of(1, 2, 3);
	const b = of(4, 5, 6, 7, 8);
	const r = [1, 2, 3, 4, 5, 6, 7, 8];

	of(a, b)
	.pipe(mergeAll())
	.subscribe({
	next: (val) => {
	expect(val).to.equal(r.shift());
	},
	complete: done,
	});
	});

	it('should merge two immediately-scheduled observables', (done) => {
	const a = scheduled([1, 2, 3], queueScheduler);
	const b = scheduled([4, 5, 6, 7, 8], queueScheduler);
	const r = [1, 2, 4, 3, 5, 6, 7, 8];

	scheduled([a, b], queueScheduler)
	.pipe(mergeAll())
	.subscribe({
	next: (val) => {
	expect(val).to.equal(r.shift());
	},
	complete: done,
	});
	});

test(mergeWith): include mergeWith tests from 7.x #7315

Are you sure you want to change the base?

test(mergeWith): include mergeWith tests from 7.x #7315

Conversation

jakovljevic-mladen commented Aug 7, 2023